From 0a6ed12d56dac08e8e8db469bb0673d52b0bf270 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Tue, 11 Oct 2016 16:43:11 +0200 Subject: [PATCH] builtinicon: remove unused struct member --- gtk/gtkbuiltinicon.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/gtk/gtkbuiltinicon.c b/gtk/gtkbuiltinicon.c index 8a2c7d3ece..ab294afc22 100644 --- a/gtk/gtkbuiltinicon.c +++ b/gtk/gtkbuiltinicon.c @@ -48,7 +48,6 @@ struct _GtkBuiltinIconPrivate { int default_size; int strikethrough; gboolean strikethrough_valid; - char * default_size_property; }; G_DEFINE_TYPE_WITH_CODE (GtkBuiltinIcon, gtk_builtin_icon, GTK_TYPE_CSS_GADGET, @@ -76,20 +75,6 @@ gtk_builtin_icon_get_preferred_size (GtkCssGadget *gadget, { *minimum = *natural = min_size; } - else if (priv->default_size_property) - { - GValue value = G_VALUE_INIT; - - /* Do it a bit more complicated here so we get warnings when - * somebody sets a non-int proerty. - */ - g_value_init (&value, G_TYPE_INT); - gtk_widget_style_get_property (gtk_css_gadget_get_owner (gadget), - priv->default_size_property, - &value); - *minimum = *natural = g_value_get_int (&value); - g_value_unset (&value); - } else { *minimum = *natural = priv->default_size; @@ -172,23 +157,10 @@ gtk_builtin_icon_style_changed (GtkCssGadget *gadget, GTK_CSS_GADGET_CLASS (gtk_builtin_icon_parent_class)->style_changed (gadget, change); } -static void -gtk_builtin_icon_finalize (GObject *object) -{ - GtkBuiltinIconPrivate *priv = gtk_builtin_icon_get_instance_private (GTK_BUILTIN_ICON (object)); - - g_free (priv->default_size_property); - - G_OBJECT_CLASS (gtk_builtin_icon_parent_class)->finalize (object); -} - static void gtk_builtin_icon_class_init (GtkBuiltinIconClass *klass) { GtkCssGadgetClass *gadget_class = GTK_CSS_GADGET_CLASS (klass); - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = gtk_builtin_icon_finalize; gadget_class->get_preferred_size = gtk_builtin_icon_get_preferred_size; gadget_class->allocate = gtk_builtin_icon_allocate; -- 2.30.2